From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Fri, 7 Jan 2011 15:22:28 +0000 (+0100)
Subject: notificationDaemon: Fix trayIcon check
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~9313
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5322e9a64391a0f2a834d0458a66943d4d0105e0;p=gnome-shell.git

notificationDaemon: Fix trayIcon check

Correctly detect non tray icons and use the ShellApp's icon in that case.
---

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 719700874..cbf34cf35 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -476,8 +476,8 @@ Source.prototype = {
             return;
 
         // Only override the icon if we were previously using
-        // notification-based icons (ie, not a trayicon)
-        if (this.useNotificationIcon) {
+        // notification-based icons (ie, not a trayicon) or if it was unset before
+        if (!this._isTrayIcon) {
             this.useNotificationIcon = false;
             this._setSummaryIcon(this.app.create_icon_texture (this.ICON_SIZE));
         }